am bf606b63: Merge "Fix mips64 cfi test"

* commit 'bf606b634691de78e19104b164c439b008f33810':
  Fix mips64 cfi test