Clean up AndroidManifest.xml

Change-Id: I37de8fd9dbe56b0106fe20a32f57dd9ea11fc88e