Merge "Add NFC in extracted-binaries builds" into gingerbread