Updated to Latest gradle and build tools