am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread

* commit '6a19759c0fae744e80c032ca3c23932e73e6d9d9':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
tree: 3df13b324209e6ab022e8508522255c975507533
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE