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

Change-Id: I559e62e635738633301d5e30910374036d36a8d1