Update gradle build, pull changes from upstream