Merge changes Idbb70f53,I10426a3f into honeycomb-mr2

* changes:
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
tree: 3b95fad964a5ac86852adf85eb49d3e17d1c5315
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE