Revert "merge conflict resolution: AndroidManifest.xml conflict on Google Play API key"

This reverts commit d83969f26e426639b11520b651069a1f08dd1ca3, reversing
changes made to 4671d05aafc1126ada4a04f63249ddc3fc64a480.