Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into HEAD

* remotes/quic/partner-android/jb-mr1-dev:
  audio: add support for HDMI and speaker combo device
  alsa_sound: change input device for communication
  alsa_sound: change voice-call stop sequence
  alsa_sound: prevent lowlatency errors triggering WD reset
  alsa_sound: avoid pcm_open error
  alsa_sound: Add support for multichannel hdmi
  alsa_sound: Add hdmi audio sink capability discovery
  alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx
  audio: fix for mismatched UseCase Type
  alsa_sound: fix watchdog error issue
  alsa_audio: route call voice to phone when on HDMI
  alsa_sound: fix for SIP call mute issue.
libalsa-intf: Add QCOM ucm files

- Add snd_soc_msm_2x for 8960 target
- Add snd_soc_msm_2x_Fusion3 for 8064 target.
  The following new mixer controls are added on
  top of QCOM's JB mainline ucm file:
  HDMI+Speaker, HiFi2, HAC Earpiece, Voice Speaker/Headset,
  HeadsetVM/HandsetVM/Camcorder Tx, Voice Recognition/Line,
  Play MusicHeadphones, and Play Music2.

Change-Id: If91005026ae9d2cf1448b20adaec0a34d0d1a89e
libalsa-intf: remove UCM files from hardware/qcom/audio

- UCM files are moved to device/qcom/common/media

Change-Id: Ice60bb2e60eeac7d336ac4cf34f1eaaed824f25d
alsa_sound: fix no TX issue during voice call

- QCOM hardware doesn't support DEVICE_IN_BACK_MIC,
  use DEVICE_BUILTIN_MIC instead

- Use SND_USE_CASE_DEV_LINE as BUILTIN_MIC UCM device.

Change-Id: Ifef85e2f819f08aab4976ec1d07d033705eab3ee
audio: Initial bring up of QCOM added audio feature.

- Update alsa_sound and libalsa-intf to JB mainline
- Use audio channel, format, and mode definitions
  from system/core instead of libhardware_legacy
- Enable AudioPolicyManagerALSA as QCOM's customized
  audio policy manager
- Enable QCOM audio features including: proxy, USB
  audio, and  ANC.

Change-Id: Ia9f0a8024a3f3e1d28210687aecfc72e6b784941
alsa_sound: Support Tunnel mode of playback

Add support for Tunnel playback

Change-Id: I161f4faf356f406fb6372bd1c28bf6b34dd1d8c0
HAL: make changes to compile audio hal for 8974.

Make changes to compile audio hal for 8974.

Change-Id: Ibd80d4bab6342b6e5456eeced4f732e697fbd175
mm-audio: intial commit of mm-audio

- Add QCOM audio decoder and encoder
  components including: EVRC, QCELP,
  AAC, AMR, AMRWB, and MP3

Change-Id: I33359c141c7a408425530171c6545e87383892ad
Merge "mm-audio: intial commit of mm-audio"
Merge "alsa_sound: Support Tunnel mode of playback"
alsa_sound: Support LPA Playback

Add support to enable Playback in LPA mode

Change-Id: I19721738cf8a6c4c8df56b02deaaad7a2172d472
Merge "alsa_sound: Support LPA Playback"
alsa_sound: Modify playback and capture period size

Modify playback perid size to 2048 bytes and capture
period size to 512 bytes.

Change-Id: I2f76ba348ac6d53784641ddb5d9a27f9bdca12ce
alsa_sound: update AudioPolicyManagerALSA for QCOM audio features

- Update USB audio, VOIP, a2dp support in AudioPolicyManagerALSA
  based on JB AU04.01.01.00.303
- Move QCOM changes AudioPolicyMangerBase to AudioPolicyManagerALSA
  to minimize base class changes

Change-Id: I9a43b11798f26385111d2ccdbff125b705525e8b
alsa_sound: Re-design USB audio solution

- Add support for AOA USB audio feature
- Currently there is no audio support for usb accessory/device
  modes. Added support for the same
- Redesign proxy to support USB accessory/device also

Change-Id: If9c975ed2d782adb0a0055fe41cfcc16fa64b59e
Merge "HAL: make changes to compile audio hal for 8974."
Merge "alsa_sound: Modify playback and capture period size"
Merge "alsa_sound: update AudioPolicyManagerALSA for QCOM audio features"
Merge "alsa_sound: Re-design USB audio solution"
audio: Fix for TTY mode parameter values in HAL

- TTY audio parameter values in HAL must match
  the values set by PhoneApp
- Support TTY mode parameters with and without
  "tty_" prefixes.

CRs-Fixed: 432843
Change-Id: I2441b41c9dabe670f86cc4485c11318739c71e86