Merge branch 'stable-3.1'

* stable-3.1:
  Add an empty tools/BUILD file explicitly for Bazel

Change-Id: I6ab3eda99756eb71bdfb2b4ad802e779a6ee0453