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

Change-Id: I34a98163bb8c37838e9102101d01c0f5b858dc35