Merge "Fix test-art-target error"