am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread

Merge commit '4e08a985418f581b4ca8c46316c85defd7b173cd' into gingerbread-plus-aosp

* commit '4e08a985418f581b4ca8c46316c85defd7b173cd':
  fix build DO NOT MERGE
tree: bdce8b555bc04e61b7fe28987fe8db44786797e0
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE