Merge "ART: Misc header cleanups" am: 9fa69d0620 am: 518ff61d35
am: eeed6b3e8a

Change-Id: Iad2ec915401961a155200fdb10b5da820ae74b5b