Revert "workaround until we find the fix for #main_activity not liking the new manifest file"

This reverts commit 2146b406779167c4a84da1a140aebe19eaaa2e80.

Android team reverted the offending change to activity_alias. We're
back to normal operation now.