Merge "Make AndroidManifest.xml entry reference config"