Merge "ART: More header cleanups"
am: fae2e3d64b

Change-Id: Iff68b00547ee8917c4c817015c1ae1ec120c38aa