Merge latest Cyanogemod code from upstream