Merge "CFI include/exclude path support (Make)"