Remove NFA_INCLUDED and NFC_INCLUDED directives

Test: Compiles
Change-Id: Ibe2de69a79b850ada456fde57386aa1213f45921
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
21 files changed