Merge change 22897 into eclair

* changes:
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
tree: 17505a5030743085dc5cd5b851c839fafb57aa76
  1. cmds/
  2. include/
  3. media/