Merge "Fix CompareUpstreams instructions for jdk8u121-b13 and jdk-9+181."