am 5c9bb1fb: Merge "Fix memory leaks in the CFI tests."

* commit '5c9bb1fb851145c124d2bedc82c7effb586ab506':
  Fix memory leaks in the CFI tests.