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

Change-Id: Id0a13cf8675b145e96ff43a22d868cf644ec8836