am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1

#define AID_UNUSED1       1022  /* deprecated, DO NOT USE */

#define AID_MEDIA_RW      1023  /* internal media storage write access */

#define AID_MTP           1024  /* MTP USB driver access */

#define AID_NFC           1025  /* nfc subsystem */

#define AID_UNUSED2       1025  /* deprecated, DO NOT USE */

#define AID_DRMRPC        1026  /* group for drm rpc */

#define AID_NFC           1027  /* nfc subsystem */

#define AID_SHELL         2000  /* adb and debug shell user */

#define AID_CACHE         2001  /* cache access */