am 5cb05eea: Merge "Fix build." into honeycomb-mr2

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