am 4c571a62: Fix the build.

Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp

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