Merge "test: Modify 458-checker-instruct-simplification for javac/dx"