Added scaffold merge of AndroidManifest.xml - bit hackish, needs work.