Update gradle files to work with latest Android gradle plugin