Merge "Fixed nfc-extras build files"