modify config file for android
Merge branch 'master' into android-1.3