Merge "Work around Jack optimizations in arm64 shifter operand test."