Remove NFA_INCLUDED and NFC_INCLUDED directives
am: 0ca4993b6e

Change-Id: Id69e7b820de9b00fb45bb4c0e66e299486868014