am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.

* commit '883b17b351fca5459fdb26f640e411a552dae7d8':
  Update build-tools revision. DO NOT MERGE.