Update for recent Android SDK, tools and gradle