Merge "Remove duplicate AndroidManifest.xml entries."