am 4b5673b7: Merge "ART: Clean up includes."

* commit '4b5673b7387804947a1605a906deee132ab28f14':
  ART: Clean up includes.