Merge "Build nfc_nci.* with BOARD_VNDK_VERSION am: d897d6db79" into stage-aosp-master am: 847a7a5f19 am: e2ad4eb7d9 am: e6fc95c442
am: b2dbe43acc

Change-Id: I62cee50ccb2029696f1bdd27a2b30d07a1d34770