Merge "ART: More header cleanups" am: fae2e3d64b
am: 273c27bcd9

Change-Id: Ifdb950366833c7a31d2b04e42c13e9ef4f9d1e8a