hal: Fix mismerge

 * Should not have been removed.

Change-Id: Icfd71d7621e99d0a164054b3dceff208f80cd28f
hal: Fix compliation when debug logs are enabled

Change-Id: Iff27af28758a54784ccce517d78582c233472eb8
audio-caf: hal: bugfixes to PLATFORM_MSM8960

* audio_hw.c: this relaxation of the if clause, at least on MSM8960, actually
  breaks voice calls. This patch fixes NIGHTLIES-250

* voice_extn: since MSM8960 doesn't have an implementation for this call, it
  returns the proper error code (-ENOSYS). We now deal correctly with -ENOSYS,
  but treating it as one possible expected behaviour

Change-Id: I72c7c780e3d689b648e0a414107caec8120df381
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_hardware_qcom_audio-caf into kitkat