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

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