am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread

Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'

* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
  Failing test cleanup.
tree: 84bdf76b4c62e93196d25480e2426d5f09be8079
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE