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

Change-Id: I009dce5613b66b5bf8bcc63a6945a47c3ada9252