Merge "Change test .dex.art to .art" am: 9c3cd19d85 am: f8bcb258a3
am: 27ba884cc0

* commit '27ba884cc012435d1610d0eb3f032d7a6b8d11bf':
  Change test .dex.art to .art