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

* commit 'f8bcb258a3549062c954ef5021071bbdf447fce9':
  Change test .dex.art to .art