Merge branch 'stable-3.1'

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

Change-Id: I4681161190f3a38e350b43d93399250a29c840d5