am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread

Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e'

* commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e':
  Attempt to fix simulator build.
tree: c82bf31e1d6d35b30c92897d26d2680b7fa10d4a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE