Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH."