Merge "Revamp run-test 431-optimizing-arith-shifts."
am: 948a2a7

* commit '948a2a7df4d818b7c1b07cd02aa21797f1c5fc58':
  Revamp run-test 431-optimizing-arith-shifts.