Merge "Fixed nfc-extras build files" am: d3ff45985a am: c1f0962ea7
am: 4b6cf3d841

Change-Id: I0a4e360b01bf336b26a3a8ccdee200198cdfcb90