am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb

* commit 'ef7aed89b610d0bd63ad7a1422b8db85730cb917':
  DO NOT MERGE Cherry-pick of cd59febcea2 from master
tree: bd73574526a2a13b96e0b8b595d33a90a6ecc804
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE