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

* commit '2c47fd4871cf8bc8b731d3a9baa66849452c9361':
  Update build-tools version. DO NOT MERGE.