modify config file for android
merged with master