[TIMOB-14978] Some Android build bug fixes and more work on the AndroidManifest.xml library.