Update to AOSP master on CDMA-related stuffs.