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

* commit '5ae182bc978db5197e1376bc31460dfa9d474b5b':
  Remove the old CFI infrastructure.