am ba1664b3: am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread

* commit 'ba1664b34cc33ebb6b45fccedb35298ff8b1d998':
  Hide some NFC API's.