Tweak timing of ANDROID_HOME