Merge "Add NFCDemo to sdk.atree" into gingerbread