am 9fae3ecc: am ab39f1ef: Merge "Fix build." into gingerbread

Merge commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6'

* commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6':
  Fix build.
tree: e44a9222f8a53d8bafecfa4fad9751e557134a8d
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE