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

Change-Id: I24af24b2514d6b3dd9e46aa7e2dc04ca150a7dda