Merge "Build nfc_nci.default with BOARD_VNDK_VERSION"