Bug#873208: upstream have fixed HEAD

[debian]

Upstream have merged the patch, but it looks like they're only going to
do it for the currently supported 2.1.x branch. They're testing and the
build of HEAD works for them on Java 9.