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