Merge branch 'stable-3.1'

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

Change-Id: I7d887fd5e7beea798901e8b7924565457d645bdf