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

* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk