AndroidManifest: cleanup