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

* commit '17cffccc6055e0349b7ca365fb75eb672ca90052':
  Fix value used for shift in quick_cfi_test.