Revert "Bug 939056: Remove MOZ_NFC=1 from android 15, 17, 18. --enable-nfc in device specific BoardConfig.mk file."

This reverts commit 2dc2cb75ce336a06d3006ad9fe09aafec9790732.
Fix enable flag for NFC in configure.in
Merge branch 'master' of ssh://github.com/svic/mozilla-central