Merge "Update expected_upstream with all of my latest openjdk merges."