gradle android plugin upgrade + catkinization.