am b00c3598: (-s ours) am f8a6d8f1: am 66b2f251: am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.

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