Merge "Fix value used for shift in quick_cfi_test."