Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread