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

Change-Id: Iee58646b92562d3aa56f4bd0e54c19118a8de707