am faf775e7: Fix simulator build (1st attempt)

Merge commit 'faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp

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