am f3f822ed: am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread

Merge commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d'

* commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d':
  Fix sim-eng build on Hardy
tree: 14edce3ac206fe1263a48c8e8fc5a71510d5a351
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE