Upgrade to latest Android gradle plugin

// FREEBIE
Closes #1660