Updates for recent Android SDK