Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_oppo_msm8974-common into test

Conflicts:
	msm8974.mk