Sync with cyanogenmod