am 25850980: am 31e7c162: Merge "ART: Remove unnecessary includes"

* commit '25850980c583e29a8827279e51bbcdfa07cd454f':
  ART: Remove unnecessary includes