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