Merge "Update to the new NFC APIs." into gingerbread
Jeff Hamilton [Fri, 21 Jan 2011 19:34:33 +0000 (11:34 -0800)]

Trivial merge