Upgrade to android-18