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