Merge "ART: Some more IWYU in common headers"