Upgrade to Android 0.4.0