am 08d1d617: am 17cffccc: am f8bdd9f3: Merge "Fix value used for shift in quick_cfi_test."

* commit '08d1d617cd45f6a2f8441658d521378ec5e23f50':
  Fix value used for shift in quick_cfi_test.