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

* commit '3d547e0dda7ad58108a219c7ef20bab426d5ea38':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk