Merge "Fix test-art 083-compiler-regressions with work around"