Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread