am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.

* commit 'c7b87766b21fe5cf2f644efa8753b936d413dc9a':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
tree: a261cac5a69ebbc5cf717395918b6e0cdf6cd0be
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE