Merge of stable cm source
manual merge of upstream CyanogenMod/android_device_oppo_msm8974-common:stable/cm-11.0