TIMOB-16088: Only skip android manifest merge if a custom manifest exists

https://jira.appcelerator.org/browse/TIMOB-16088

Test case in Jira.  Please also test the case where you don't have a custom android manifest.