Merge change I3429f77a into eclair

* changes:
  Suppress flaky test HeapTest#testOomeLarge.
tree: dbbb0e77ce627e5ac9cbc61ddb30582ff4319822
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE