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

Change-Id: Ia5c8215b7b3a5fc2517ef072a53511bcbc6f8401