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

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