Merge "Move .config for Android to android.config"