Merge "Add AID_NFC for use by the NFC service." into gingerbread