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