Getting stuff to work with later version of gradle and android build tools