am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread

* commit 'e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
  NfcAdapterExtras: reset singleton state if initialization fails.