Use AOSP's prebuilts/tools for now
Merge remote-tracking branch 'PSD/remix-legacy' into legacy-staging