Updated for latest version of android and using new manifest merge style, removed some unnecessary manifest information that gets overridden by gradle