Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of github.com:Team-Hydra/android_hardware_qcom_media-caf into cm-11.0