Merge "Add NfcNci to default builds." into oc-dev am: 53b345dd22
am: cc50370515

Change-Id: I47d7a8cb0f8874907598b535cfc73b02cab15f9a