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

Change-Id: I2697a8ba298c77b12d3a398fcfff7c633f7959ab