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

* commit '3136bc9ebea502f6280be7e0796b98b13beec959':
  Fix memory leaks in the CFI tests.