Merge "NFC sample app  (DO NOT MERGE)" into gingerbread