Merge "Update version of jarjar to with Gradle 5.0"