Merge "CFI include/exclude path support (Make)" am: 61bc4f790e
am: aef48af62a

Change-Id: I601f9cce2189f384ee3263695daa5bd39895a4cb