Merge "Export proguard.flags, manifest and sources for use by SettingsGoogle"