replace cm's nfc_enhanced.mk with ours

Change-Id: Ib51949d6371e37094a283dee930966050141778a