Reconcile with jb-mr1-release - do not merge

Change-Id: Ie754a300e8665e6dfd25260714851d7bbe99261f
am cf7bd883: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cf7bd88327618664ea31bc9ee2cb76368d0de44b':
  alsa_audio: route call voice to phone when on HDMI
  alsa_sound: fix for SIP call mute issue.
  Revert "alsa_sound: fix for SIP call mute issue."
  alsa_sound: fix for SIP call mute issue.
  alsa_sound: fix for output device routing during video chat
  audio: add the headset tx
  hardware/alsa_sound: Change the device disable sequence
am 5f24fd93: alsa_sound: fix watchdog error issue

* commit '5f24fd93afdcc66bfd9246a0e0000c0fd7283b7f':
  alsa_sound: fix watchdog error issue
am 546bdab3: am 5f24fd93: alsa_sound: fix watchdog error issue

* commit '546bdab37dd2570cc1f4f5ecc89779ac4f6346d0':
  alsa_sound: fix watchdog error issue
Reconcile with jb-mr1-release - do not merge

Change-Id: I029549918f3f7236eb5e058372221167d8618a70
am 5b689625: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5b689625cf2aaefbdc4e56651c1f138be5417179':
am a8b76531: audio: fix for mismatched UseCase Type

* commit 'a8b76531e6eef695eae174fd628396a5b4c95b7f':
  audio: fix for mismatched UseCase Type
am 87459f08: alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx

* commit '87459f0857fe7fab51f45337f330bce03a53c3dc':
  alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx
am b357a77d: alsa_sound: Add hdmi audio sink capability discovery

* commit 'b357a77dc9c72cb6e327e945421f440052233b51':
  alsa_sound: Add hdmi audio sink capability discovery
am bf1c8748: alsa_sound: Add support for multichannel hdmi

* commit 'bf1c87481d62736cab8832e9085c121fbafdbb6b':
  alsa_sound: Add support for multichannel hdmi
am 2c798912: alsa_sound: avoid pcm_open error

* commit '2c79891211108cd8157124c1b6f9d393729602ff':
  alsa_sound: avoid pcm_open error
am 14f773e8: am a8b76531: audio: fix for mismatched UseCase Type

* commit '14f773e88ca13d9279602cdcf81bf8c22c28e985':
  audio: fix for mismatched UseCase Type
am a1852d1b: am 87459f08: alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx

* commit 'a1852d1b2d42d3964400500aca80274d7e326d3b':
  alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx
am b9047ffc: am b357a77d: alsa_sound: Add hdmi audio sink capability discovery

* commit 'b9047ffce7e552901e367018d393e415fbc56c43':
  alsa_sound: Add hdmi audio sink capability discovery
am d0947edb: am bf1c8748: alsa_sound: Add support for multichannel hdmi

* commit 'd0947edb99697b88bc61f574eeef6041bda9022f':
  alsa_sound: Add support for multichannel hdmi
am 72f83fe8: am 2c798912: alsa_sound: avoid pcm_open error

* commit '72f83fe83242142ad3f10fb87f19e6d7d33b7c49':
  alsa_sound: avoid pcm_open error
Reconcile with jb-mr1-release - do not merge

Change-Id: I9083ad000467a93228455a796ffcd353f097a0d8
am 694b033a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '694b033a0da0774a1a38e253cad536e4b1f897c2':
am 89c224e2: alsa_sound: prevent lowlatency errors triggering WD reset

* commit '89c224e298fd280a3f2a69da8cc930ff6d036e18':
  alsa_sound: prevent lowlatency errors triggering WD reset
am f8b71955: am 89c224e2: alsa_sound: prevent lowlatency errors triggering WD reset

* commit 'f8b719552d3cf2cdb56ff8a08833438195835414':
  alsa_sound: prevent lowlatency errors triggering WD reset