Fix build: Remove cm's nfc stuffs

We include in vendor/vanir...

Change-Id: I545734d064ca0c0f19b957e4ff3ad8b3ca8d0984