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