Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"