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
tree: 7102f0993e90834984c91e0d5beddc7f7a01f4ac
  1. alsa_sound/
  2. libalsa-intf/
  3. Android.mk