am dc54a8c7: Merge "API changes for NFC." into gingerbread

* commit 'dc54a8c742e96d6ea8ef3e18c0f2ee1235899599':
  API changes for NFC.