Merge "Verbatim update of platform AndroidManifest.xml."