am 86214276: am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread

Merge commit '86214276e05d81e4820862341ce9e2e3c83cd136'

* commit '86214276e05d81e4820862341ce9e2e3c83cd136':
  Manually revert a single-line error inserted by OpenJDK.
tree: 50aa3ad08660fb96066b49ca042241fae09aeaec
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE