Upgraded to Google Maps Android API v2