Merge "ART: Fix up small header includes" am: d88a2b5cf4
am: 8d2c5f84cc

Change-Id: I185771488634137aaab43e5e019e948d86208205