merge v6 settings.apk