am 50eec484: am bf606b63: Merge "Fix mips64 cfi test"

* commit '50eec484d459daad4de73f91f443b0fb78176860':
  Fix mips64 cfi test