Fixed 'gradle build' issue with AndroidManifest.xml merge