Merge change 22986 into eclair

* changes:
  Squashed commit of the following:
tree: bbd7ca2e49eaf8c182403dfb86c9b245196a7f8f
  1. cmds/
  2. include/
  3. media/