Merge change I93f500a5 into eclair

* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
tree: 42b7543e1686bbce2534c46376079202fe064b10
  1. cmds/
  2. include/
  3. media/