Merge "Prepare for move to prebuilts/build-tools"