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

* commit '31e7c1628ffd90018a971e6650c924dc804b9a9a':
  ART: Remove unnecessary includes