Android detection improvements (add ANDROID_HOME environment variable)