Migrated to latest Android SDK