am 967414c4: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '967414c4692df6988ea3ae7424199ebf1f89156c':
  qcom/audio/hal: Fix the issue audio not routed to headset
  qcom/audio/hal: Enable debug logs
  Revert "Fix routing for wired headset"
  qcom/audio/hal: Fix no voice call audio on bt-sco device
  Fix routing for wired headset
tree: 64ac8ad2fbb8fcc7aeea97111a0621ad521c7bc9
  1. hal/
  2. legacy/
  3. Android.mk