am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread

* commit '14789d1eab905728da4f6995816c80716caf52f4':
  Add NFCDemo to sdk.atree