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

Change-Id: I5c3c4b55d31f3451794d94b3524ec6190bdeeef2