Upgrade buildTools and gradle versions