am 3f43a5d6: (-s ours) am c5981e1b: Merge "Workaround for breaking change in OpenJDK 8 javadoc"

* commit '3f43a5d67810eebd90fe2a7a9d13e3fa1c4d4216':