Merge "nfc: Add nfc-base.h" am: 45182ed0e8 am: 8b5e7a4360
am: 94e3a35f8c

Change-Id: If2f56d04f99b1f1198ab306a2e72c241b2a8c28d