Merge "Add build file for CFI file"