Merge "ART: More header cleanups" am: fae2e3d64b am: 273c27bcd9 am: 8f0cc681ad
am: 53f8d8ebc3

Change-Id: I2f20517008bd17987e5cbb866bb302ad3de8fcb3