Merge "Update nfc-base.h"