am 2e6b8c74: am 70494a14: (-s ours) am 2b2ff810: am 058c4b4b: Update tools-common prebuilts. [DO NOT MERGE]

* commit '2e6b8c74555ac0774f1585bdbbc9db2b1c5e093a':
  Update tools-common prebuilts. [DO NOT MERGE]