Remove duplicate AndroidManifest.xml entries.

The automerger added the entries twice...

Change-Id: I7910cb2126b339b0c8aee11051db1a2de8ae26ae
1 file changed