Merge "ART: Some more IWYU in common headers"
am: c0bb8c7a1e

Change-Id: Iab1ca0bd21e65cb441f49f7365ebbfff2c7db0a6