merge CyanogenMod/cm-11.0