Merge "Fix wrong format in AndroidManifest.xml"