Upgrade to Android SDK v2.0.0