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

Change-Id: Ie648d120e0241a52133a2b17d3297b8be49c8b74