Merge "Fix warnings in external/libnfc-nci/src." am: cc6d4f1381
am: 2e97d51430

* commit '2e97d5143065b98b57cb471790e89ba723a3c786':
  Fix warnings in external/libnfc-nci/src.

Change-Id: Ib953900f68195e4d663a744398d29731d7282028