[Xperia Z3 Compact General] m0d:
Compile error

I was not able to compile with new update:

In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/dm/nfa_dm_cfg.c:25:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD
^
In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/dm/nfa_dm_api.c:26:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD
^
In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/int/nfa_sys.h:30,
from external/libnfc-nci/src/nfa/dm/nfa_dm_discover.c:27:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD
^
In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/int/nfa_sys.h:30,
from external/libnfc-nci/src/nfa/dm/nfa_dm_act.c:27:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD
^
In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/int/nfa_sys.h:30,
from external/libnfc-nci/src/nfa/int/nfa_ce_int.h:28,
from external/libnfc-nci/src/nfa/ce/nfa_ce_act.c:26:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD
^
In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/dm/nfa_dm_main.c:27:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD
^
In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/int/nfa_sys.h:30,
from external/libnfc-nci/src/nfa/dm/nfa_dm_ndef.c:26:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD

In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_ce_api.h:29,
from external/libnfc-nci/src/nfa/ce/nfa_ce_main.c:26:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD

In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/nfc/include/nfc_api.h:32,
from external/libnfc-nci/src/nfa/include/nfa_api.h:32,
from external/libnfc-nci/src/nfa/ce/nfa_ce_api.c:26:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected identifier or '(' before '<<' token
<<<<<<< HEAD

In file included from external/libnfc-nci/src/hal/include/nfc_hal_api.h:27:0,
from external/libnfc-nci/src/include/NfcAdaptation.h:24,
from external/libnfc-nci/src/adaptation/NfcAdaptation.cpp:19:
hardware/libhardware/include/hardware/nfc.h:56:1: error: expected unqualified-id before '<<' token
<<<<<<< HEAD
^
hardware/libhardware/include/hardware/nfc.h:74:3: error: 'nfc_nci_module_t' does not name a type
} nfc_nci_module_t;

Problem with libnfc-nci Cherry Picks?