am 08583a09: Merge "ART: Fix build"

* commit '08583a096adb04e57b7b57ba4d87b006582e7ee9':
  ART: Fix build