Merge changes I187d2ff0,I6ad7d9eb into expected_upstream

* changes:
  Merge JapaneseEra from jdk8u/jdk8u222-b01 into the  expected_upstream branch
  Import JapaneseEra from jdk8u/jdk8u222-b01
tree: afa20a19d55d638b3860ace778ed05071ff1dd73
  1. ojluni/
  2. tools/
  3. EXPECTED_UPSTREAM