Merge "Add NfcNci to default builds." into oc-dev