Merge "Address API review comments." into nyc-dev

am: 9a32929def

* commit '9a32929def3425c55a1bc96ea20346bf95357ae4':
  Address API review comments.

Change-Id: Ieb67cdc7846a06d84280e9ea9ca1cbe34dbff78f

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/nfc/cardemulation/NfcFCardEmulation.java
Simple merge