Merge "Switch aidl and zipalign prebuilts to build-tools"