Merge "ART: Misc header cleanups"
am: 9fa69d0620

Change-Id: I3a37299d97b3312abf7bd3c29dac1af008b29d64