Android manifest merge typo resolved