am 5e782937: am faf775e7: Fix simulator build (1st attempt)

Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74'

* commit '5e782937ead3042255d83f9c1192f2cc7b688d74':
  Fix simulator build (1st attempt)
tree: f931fb5a2c2b31b426b5de6ffcc3ad30ad77398a
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/