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

Change-Id: I80da23d4dbe6dfa2595c6487a2ab03a362d279dd