Merge changes Ia1d57979,Ib663ac71 into expected_upstream

* changes:
  Merge files from jdk11u/jdk-11.0.13-ga into the  expected_upstream branch
  Import files from jdk11u/jdk-11.0.13-ga
tree: 2c6acd9684cbcd0ad652e2b034e1f5c82268ea17
  1. ojluni/
  2. tools/
  3. EXPECTED_UPSTREAM