Update gradle build to SDK21

This updates the gradle build to the latest plugin + sdk. Also fixes a manifest merge issue.