Merge "Revamp run-test 431-optimizing-arith-shifts."