Updated 1.8 JavaHL backport to sync with the 1.8.9 release.