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

Change-Id: I2eb12f2e49d9bc089649df86b2e262f26e92a6e7