Increase default IsoDep timeout to 1200ms.

An increasing number of IsoDep tags in the field
requires more than 600ms to respond to initial
NDEF commands. To make sure we can detect these
tags properly, increase the default timeout for
IsoDep to ~1200ms.

Bug: 7600632
Change-Id: I690e2c1993b64c0f639423d5cf0c810f56ad1197
NDEF Type 3 tag reading with padding bytes

NDEF Type 3 tag reading was not ignoring the padding bytes, which
leads to failure of parsing the NDEF data. This patch fix that problem.

Bug: 7600630
Change-Id: I45cf1841bdc343503a8a12d622ac8470c3e64ce4
Merge "NDEF Type 3 tag reading with padding bytes" into jb-mr1.1-dev
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp

Conflicts:
	src/phHal4Nfc_ADD.c

Change-Id: I950a66598954d21b49f723da2c58bff2ba719239
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
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/libnfc-nxp into 1.1

Android 4.2.2 release 1