am 67672e04: Merge a775965b from gingerbread

Merge commit '67672e04111a6cfdf572023a154675749c3fb550'

* commit '67672e04111a6cfdf572023a154675749c3fb550':
  Add AID_NFC for use by the NFC service.