Revert "Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_hardware_qcom_media-caf-new into cm-11.0"

This reverts commit 64ae6f50574cfeeb0ed86d85d2d4cb6f9c557eea, reversing
changes made to b4ac508cb135af99f7989899c0230e15e64f6f10.
Revert "Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_hardware_qcom_media-caf-new into cm-11.0"

This reverts commit 64ae6f50574cfeeb0ed86d85d2d4cb6f9c557eea, reversing
changes made to 060fc1d4ad2a37ca227a7f700fbec67e90c55446.