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