am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
  Fix the simulator build.
tree: e77993106962eabf522259f9a23a0a421b1a5118
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/