am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclair

Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a'

* commit 'f31f365a7708c931e955670bc6213fdc8f91a87a':
  Fix issues 2333450 and 2333559:
tree: 2ec9ec8d570be4201bb88daac155f3f22f4df747
  1. cmds/
  2. include/
  3. media/