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

* commit '47ebdd97527e7fdfca7c62b3569ae3a453afc2f4':
  Update build-tools version. DO NOT MERGE.