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

Change-Id: Ia2ab8836781f3fa98782bc790fc76545c8eecb5a