Update upstream from CyanogenMod:cm-11.0 branch