Merge remote-tracking branch 'cm/cm-10.2' into android-4.3

Conflicts:
	alsa_sound/AudioPolicyManagerALSA.cpp
	libalsa-intf/alsa_ucm.c
audio-caf: update merged commits for mr2

Change-Id: I98024edb0ff409cf127fc0a8d22e53849ef61eea
audio: fix merge error

Change-Id: I0abc922d19e33725ca1962e2b275762749e91a1d
audio-caf: Add filtering for TARGET_QCOM_AUDIO_VARIANT

Don't build unless it's CAF

Change-Id: I9208ed714952c44405ae79594d5ff43d51585bc5
audio-caf: QCOM's revenge

Based on CAF kk_2.7_rb1.9

Change-Id: I2d7674d0677f13c5da0dcd3e9b38fd77949ea901
Fix build for msm8660

Change-Id: I3ed9cc684c16e4dffe53d8823526bf14f58b6280
audio-caf: added BOARD_HAVE_LOW_LATENCY_AUDIO

Allows disabling usage of Lowlatency use cases - default is
to use them

Change-Id: I7ad9a539886de32929aeef4b08d4a1d2323820fb
audio-caf: who really wants to see this in the log

Change-Id: Ie6e0291f725ec9bf2648bf37bf7ec8349c0d6739
Merge "audio-caf: added BOARD_HAVE_LOW_LATENCY_AUDIO" into android-4.4
audio-caf: redundant ifeq is redundant

Removed duplicate ifeq check

Change-Id: Ic30e66b87e9600b130b8286a48b54da17cc4b9a0
alsa_sound: separate fast CSD call device switching from CSD sessions

* This was two separate commits from upstream, some devices may have
  support for CSD sessions but no support for the fast call switching
  functionality.

Change-Id: I74951e3bad0c4ace1c889b3481c141f047e3ef0e
Merge branch 'android-4.4' of https://github.com/vwmofo/android_hardware_qcom_audio-caf into side