am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent  from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.r

* commit '9e05c9e4e642673dc6d9104c44d26810773c382d':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.