Merge "Fix libart tests on target"