Make AndroidManifest.xml's activity match what's in Java files

Change-Id: I9489d32a715a1aa7f8449495b7c1101a1ad1eac6
4 files changed