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

Change-Id: Ie2813ef44e68e8336ecc93c20940b23467e72fc3