Merge "Updating the gradle and build tools version" into ub-launcher3-master