Merge change I4961c959 into eclair

* changes:
  fix [2152536] ANR in browser
tree: af3fdf56529cd7f2571c9e93d5be1cd9cfdee9e9
  1. cmds/
  2. include/
  3. media/