am d0dc0293: am 08583a09: Merge "ART: Fix build"

* commit 'd0dc029370d727ab2a43223ea25e88cf3f68c924':
  ART: Fix build