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

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