Merge "Remove overlaps in openjdk filegroups"