Add ANDROID_HOME
Tweak ANDROID_HOME