Merge pull request #181 from viralwang/bug1008809

Bug 1008809 - build libnfc-nci.so from partner code instead of extract-f...
Conflicts:
	flame.xml