am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"

* commit 'e3e74aa50e74a3465295b9405ea0fccca62472a1':
  Move stuff from prebuilt to prebuilts/tools