am b6264a87: Fix the build.

Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp

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