Squashed commit of the following:

commit bc0f99a540d75e8f5051fffeea1f27bff11e1eb4
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Feb 6 11:39:51 2013 -0800

    libnfc-nxp: Add alternate firmware path

     * Check in /system/lib for firmware as well, so we can be bug-for-bug
       compatible with OEMs.

    Change-Id: Iea350c3d0a58a1f6012c2a088f8ba6fed4b10365

commit dd55580a6f3d72175f0cb78c9fc4fac59cf9be09
Merge: 5199e59 68c93f6
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Dec 27 12:53:20 2012 -0800

    Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp

    Conflicts:
    	src/phHal4Nfc_ADD.c

    Change-Id: I950a66598954d21b49f723da2c58bff2ba719239

commit 5199e59069db67d4f3bb2a466adab2e4647e8e70
Merge: ebad753 aac6c7f
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Oct 3 22:14:20 2012 -0700

    Merge "On some handsets, there is a configuration of hardware that causes a conflict with HCE.  Primarily it is something in the SWP configuration with a SWP sim card.  It appears to be a PN544 register setting that blocks HCE type A only from initialization.  This patch checks for this conflict and disables HCE for those configurations.  The better way would be to understand how to set the PN544 registers to unblock the conflict, but this is a sufficient work around for this minority of configurations" into jellybean

commit aac6c7f9d9456f76bc7b4da9c964050a41da1414
Author: doug yeager <doug@simplytapp.com>
Date:   Wed Sep 26 10:35:28 2012 -0500

    On some handsets, there is a configuration of hardware that causes a conflict with HCE.  Primarily it is something in the SWP configuration with a SWP sim card.  It appears to be a PN544 register setting that blocks HCE type A only from initialization.  This patch checks for this conflict and disables HCE for those configurations.  The better way would be to understand how to set the PN544 registers to unblock the conflict, but this is a sufficient work around for this minority of configurations

    Change-Id: I64d79acaa7eb58e15f1fb4bbe298883036f6d45a

commit ebad753d0010683dc1299159354a55175b58f047
Merge: bed2b70 55f43da
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Aug 31 12:04:10 2012 +0400

    Merge "card emulation patch port to JB" into jellybean

commit 55f43da8fa1a5ac7e9e88f81381a80345fa3ac50
Author: doug yeager <doug@simplytapp.com>
Date:   Thu Aug 23 10:27:28 2012 -0500

    card emulation patch port to JB

    Change-Id: I86657f9c547840de33c35df4912b5f282d4fe459

commit bed2b7058f8f3bdfbbc7fa550aecd9f4cf95d07a
Merge: 42fef9f 856d765
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Aug 10 01:27:13 2012 -0700

    Merge branch 'jb-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp