Merge "Optimizing: Fix arm64 shifter operand test."