Workaround Try 2: tweak PATH with new ANDROID_HOME