Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
tree: af0a34a532311fbd20969741e2511ab16570cd2d
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE