build: CFX -> NEW

More Clang work

Change-Id: I6559c96841abcf7edb09e47e33665d9d2b446b8c