Format AndroidManifest.xml file

This will make resolving merge conflicts more easy
Formatted with eclipse(Shift+Ctrl+F)