Documented AndroidManifest.xml instead of relying on merge

Merging the new theme property on SurveyActivity causes conflicts
and people get mad.