Merge "Change test .dex.art to .art"