Add some settings for building Android.
Resolve conflicts.