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