Merge "Merge "Build nfc_nci.* with BOARD_VNDK_VERSION am: d897d6db79" into stage-aosp-master am: 847a7a5f19 am: e2ad4eb7d9" into oc-dr1-dev-plus-aosp am: a065a8a785 am: c67394c156
am: 48b7cdc752

Change-Id: I9f9f0a835682938f48b1b057673d388d3ac9d022