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

* commit '602a96be32d2e9a67cafb88fa78caa4b89280db4':
  Fix memory leaks in the CFI tests.