Merge "Fix libart tests on target" into nyc-dev