Merge "Fix ART run-test 562-no-intermediate."