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