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.