Merge "fix typo for AndroidManifest.xml"