Tidy up AndroidManifest.xml

Formatting only; no functional changes