Android gradle plugin upgrade