am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

* commit 'c00cc5f22689e0c6dba50b6bf8dc085ffca20d39':
  cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
tree: 2de34eaf949bd30904e7e7343a64fce86fec4561
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE