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