Trying to Build Android 6.0

So I've build aosp in the past for nexus 10 but figured with some xda help we might be able to get this running.
device/samsung/manta/ revision="android-m-preview-2"
kernel is prebuilt and included in device tree
binaries are newest available Android 5.1.1 (LMY48T)

current problem I'm having is with Bluetooth

Code:

---

target thumb C: libbt-brcm_bta <= system/bt/bta/./dm/bta_dm_act.c
system/bt/bta/./dm/bta_dm_act.c: In function 'bta_dm_set_visibility':
system/bt/bta/./dm/bta_dm_act.c:542:5: warning: implicit declaration of function 'BTM_BleReadDiscoverability' [-Wimplicit-function-declaration]
    UINT16 le_disc_mode = BTM_BleReadDiscoverability();
    ^
system/bt/bta/./dm/bta_dm_act.c:544:5: warning: implicit declaration of function 'BTM_BleReadConnectability' [-Wimplicit-function-declaration]
    UINT16 le_conn_mode = BTM_BleReadConnectability();
    ^
system/bt/bta/./dm/bta_dm_act.c: In function 'bta_dm_remove_device':
system/bt/bta/./dm/bta_dm_act.c:669:85: error: 'tBTA_DM_PEER_DEVICE' has no member named 'transport'
                btm_remove_acl( p_dev->bd_addr, bta_dm_cb.device_list.peer_device[i].transport);
                                                                                    ^
In file included from system/bt/bta/../include/bt_target.h:1714:0,
                from system/bt/bta/./dm/bta_dm_act.c:26:
system/bt/bta/./dm/bta_dm_act.c:671:71: error: 'tBTA_DM_PEER_DEVICE' has no member named 'transport'
                                  bta_dm_cb.device_list.peer_device[i].transport);
                                                                      ^
system/bt/bta/../include/bt_trace.h:369:181: note: in definition of macro 'APPL_TRACE_DEBUG'
 #define APPL_TRACE_DEBUG(...)                    {if (appl_trace_level >= BT_TRACE_LEVEL_DEBUG) LogMsg(TRACE_CTRL_GENERAL | TRACE_LAYER_NONE | TRACE_ORG_APPL | TRACE_TYPE_DEBUG, ##__VA_ARGS__);}
                                                                                                                                                                                    ^
system/bt/bta/./dm/bta_dm_act.c:674:56: error: 'tBTA_DM_PEER_DEVICE' has no member named 'transport'
                if(bta_dm_cb.device_list.peer_device[i].transport == BT_TRANSPORT_LE)
                                                        ^
system/bt/bta/./dm/bta_dm_act.c:690:5: warning: implicit declaration of function 'BTM_ReadConnectedTransportAddress' [-Wimplicit-function-declaration]
    if ((other_transport && (BTM_ReadConnectedTransportAddress(other_address, other_transport))) ||
    ^
system/bt/bta/./dm/bta_dm_act.c:701:82: error: 'tBTA_DM_PEER_DEVICE' has no member named 'transport'
                btm_remove_acl(other_address,bta_dm_cb.device_list.peer_device[i].transport);
                                                                                  ^
system/bt/bta/./dm/bta_dm_act.c: In function 'bta_dm_discover_device':
system/bt/bta/./dm/bta_dm_act.c:2318:52: error: 'tBTM_INQ_RESULTS' has no member named 'device_type'
        && (bta_dm_search_cb.p_btm_inq_info->results.device_type == BT_DEVICE_TYPE_BLE)
                                                    ^
build/core/binary.mk:801: recipe for target 'out/target/product/manta/obj/STATIC_LIBRARIES/libbt-brcm_bta_intermediates/./dm/bta_dm_act.o' failed
make: *** [out/target/product/manta/obj/STATIC_LIBRARIES/libbt-brcm_bta_intermediates/./dm/bta_dm_act.o] Error 1

#### make failed to build some targets (22:50 (mm:ss)) ####

---