Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8

Change-Id: I391d8e1be1a61e68b01f0db371dbb4ed3e5b5933
nfc: Add alternate firmware path

 * So we stay bug-for-bug compatible with OEMs.

Change-Id: I0c14568d9f587ebcd2d21c0f0490b705be7ce8ce
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Nfc into 1.1

Android 4.2.2 release 1
Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2