am 2b2ff810: am 058c4b4b: Update tools-common prebuilts. [DO NOT MERGE]

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