Gradle updates, manifest fixes for manifest merging