am a1fd8e44: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"

* commit 'a1fd8e44b71a83f2733258b020c4057af3c4046a':
  Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools