am 81f339bc: Merge "Fixing the build." into gingerbread

Merge commit '81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp

* commit '81f339bcfeee5dccb284cdeac6941179f91fe08b':
  Fixing the build.
tree: 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE