Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Add an empty tools/BUILD file explicitly for Bazel Change-Id: I2c010b9d05f9ecf427bb46cb8416edcdb6ec433c