Merge "Updating gradle and build tools version" into ub-launcher3-dorval
am: 950825d948

Change-Id: I1c730b67862a84be430291070fec47c68df68827