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

* commit '2787b3ea0a6c48f23db2999d4194b11ceacbae39':
  Update build-tools version. DO NOT MERGE.