am 18c00089: Merge "Misc fixes for sim-eng build." into gingerbread

Merge commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb' into gingerbread-plus-aosp

* commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb':
  Misc fixes for sim-eng build.
tree: 19aabb3f1a49b5b96b18c4b1ffd531bfbf2ceffa
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE