Upgrading gradle and android build tools verion