am ffbd2426: Merge change 21340 into eclair

Merge commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5'

* commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5':
  Squashed commit of the following:
tree: dcc952183cfd766d385c25665571be967926cf89
  1. cmds/
  2. include/
  3. media/