Merge "Merge "Fix ANDROID_SDK_HOME handling."" into tools_r11