am 16cc72bd: Fix simulator build.

Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2

* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
  Fix simulator build.
tree: 2862a6b0b87a19889e10cddf829e3bd922822583
  1. cmds/
  2. include/
  3. media/