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

Change-Id: If91fd36b7993025edb6f8d1202eedcb8555f3281