am cde8e5da: Merge "Remove the old CFI infrastructure."

* commit 'cde8e5da3e774a2494b051043130c0495eca09ef':
  Remove the old CFI infrastructure.