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

Change-Id: Ifdd0bd99cde918e9251ce09bf032c695a0dd8606