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

Change-Id: I562bec1735557ed6718da4004fdd54e822f1e7f3