Merge "Tweak java.util classes to minimize diffs vs. upstream"