am a80aab6d: Merge "ART: Fix test breakage"

* commit 'a80aab6dab72c5614b723c6690af8c79e3dcce60':
  ART: Fix test breakage