am 9700884b: am 2787b3ea: am e0621935: am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.

* commit '9700884b89da1aa63f4c67651712e2363cb3708b':