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

Change-Id: I4786af397c556c72d1f7ac9ff7d762fa3efcf90b