Merge "test: Fix 593-checker-shift-and-simplifier for target" am: 4ebbb60485
am: ca1f343698

Change-Id: I02fba3ca52710f2ab7847e3dd2f5dbf36832ad2f