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

Change-Id: I9c0b545c46f61e5b4c9a7fdf6544d17bca69a0f7