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