am 0f6a8b04: am d1169045: Merge "ART: Fix test"

* commit '0f6a8b04c8eb5e59591c548762af30242dbc33f7':
  ART: Fix test