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

* commit '359e1f85c9f12e7d5c33cd984662e7dfa1c545a7':