Update to use latest gradle and android build tools