Merge change I49f02be9 into eclair

* changes:
  Issue 2265163: Audio still reported routed through earpiece on sholes
tree: e270f842df4d078948ecb80aefb31f7658d866bc
  1. cmds/
  2. include/
  3. media/