Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
* tag 'android-6.0.0_r26':
Fix fail to write RF parameters
add recovery mechanism on CORE_RESET_NTF
Finalize .conf file
Add Mifare Classic support.
Fix stuck issue on Kovio barcode
Adding MiFARE DESFire format support
Handle notification type value 1 in RF_DISCOVER_NTF
Fix Mifare Classic presence check.
Fix ISO15693 tag crash issue
Bump libnfc-nci version for M.
Fix conflict vendor proprietary Protocol and Discovery technology definitions
Add Peer-To-Peer priority mechanism
ISO-DEP presence check workaround
Avoid routing table update if nothing changed.
Update customized settings to eeprom after firmware download
T1T HR0 and HR1 parameters missing.
Memory leak and NULL pointer check fixes.
Change-Id: Id7dc92bba0fa738166b0d2d1f5f3dba034c4ad74