am f29a2fb..e07ad10 from mirror-m-wireless-internal-release

e07ad10 merge in m-wireless-internal-release history after reset to d232721ae5e5b6949a5249f0d116408b8a3c5f1d
d232721 L2CAP socket - fix merge errors
899b771 BR/EDR secure connections support
7fb0da6 Support numeric comparison in SMP
aa351f2 merge in m-wireless-internal-release history after reset to 399e89150b3df87172bdf92d54712b379324b149
399e891 Fix for AVRCP CTRL stops sending pass through command
daddea9 Free Avrcp Controller callbacks on Cleanup
764babe Protect reset of out stream with mutex
444a8da LE Privacy 1.2 and LE secure connections
8372aa5 L2CAP and SDP Search API for BT profiles (2/2)
fd422a7 Update Service Availability.
2a0652a merge in m-wireless-internal-release history after reset to 0b47e0a35c16f5b7d77c30ec1c095ed92ff4fd74
78d0f4c merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
0b47e0a Avoid duplicate disconnection callbacks for fixed channel connections
5646973 Add a section on assertions to the style guide.
d768767 Merge "Avoid null-pointer dereference in l2c_release_lcb()" into m-wireless-dev
ef92b53 Avoid null-pointer dereference in l2c_release_lcb()
4bf68bf merge in m-wireless-internal-release history after reset to f538707fe64c62b1dbb8e4210e4a1bfa0bab2b56
de6ac86 Add a 'Bluedroid conventions' section to the style guide.
1b80439 Add a section to the style guide on variable declarations.
485f19e merge in m-wireless-internal-release history after reset to 4540f59bc447dc2b7b31a3e974b74a60b2417e7d
bef8940 merge in m-wireless-internal-release history after reset to 841c9103cad1898ceca87b734acd4d4537f9f452
ab4c38c merge in m-wireless-internal-release history after reset to a7e698f5a9e062f62e21bc435643975c30bab846
2807a74 merge in m-wireless-internal-release history after reset to a7e698f5a9e062f62e21bc435643975c30bab846
99dbe9a merge in m-wireless-internal-release history after reset to 78c0b060f29b7b7014adddb2f98bf6ae9755c488
f7f8399 merge in m-wireless-internal-release history after reset to a5371c238b4e874d8313ac56a23451e7345ff541
3aa60d7 Make A2DP audio HAL a shared library again
3256a31 Move unused include file out of hci_audio.h
b866b69 Add option for schedule_next_instance to force rescheduling
4ae5e3e Ensure alarms are called back when they expire in the past
a7bd03e Rewrite alarms to use a single posix timer instance
88e7b15 Resolved hardware error observed during SCO Connection setup

Change-Id: Ib9a0a2ffca1d4811a9a9e56674bf43275d8b2205

diff --cc bta/Android.mk
Simple merge

diff --cc bta/dm/bta_dm_act.c
Simple merge

diff --cc bta/hf_client/bta_hf_client_act.c
Simple merge

diff --cc bta/include/bta_api.h
Simple merge

diff --cc bta/jv/bta_jv_act.c
index c9299e8,46b8f7b..a182672
--- 1/bta/jv/bta_jv_act.c
--- 2/bta/jv/bta_jv_act.c
+++ b/bta/jv/bta_jv_act.c
@@@ -976,8 -1750,10 +1750,8 @@@ static void bta_jv_port_mgmt_sr_cback(U
      tBTA_JV evt_data;
      BD_ADDR rem_bda;
      UINT16 lcid;
 -    UINT8  num;
 -    UINT32  si;
      APPL_TRACE_DEBUG("bta_jv_port_mgmt_sr_cback, code:%d, port_handle:%d", code, port_handle);
-     if(NULL == p_cb || NULL == p_cb->p_cback)
+     if (NULL == p_cb || NULL == p_cb->p_cback)
      {
          APPL_TRACE_ERROR("bta_jv_port_mgmt_sr_cback, p_cb:%p, p_cb->p_cback%p",
                  p_cb, p_cb ? p_cb->p_cback : NULL);

diff --cc btif/src/btif_av.c
Simple merge

diff --cc btif/src/btif_core.c
Simple merge

diff --cc btif/src/btif_dm.c
index 9e81af6,54bcca8..aed6329
--- 1/btif/src/btif_dm.c
--- 2/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@@ -240,10 -243,9 +243,10 @@@ static char* btif_get_default_local_nam
  extern UINT16 bta_service_id_to_uuid_lkup_tbl [BTA_MAX_SERVICE_ID];
  extern bt_status_t btif_hf_execute_service(BOOLEAN b_enable);
  extern bt_status_t btif_av_execute_service(BOOLEAN b_enable);
 +extern bt_status_t btif_av_sink_execute_service(BOOLEAN b_enable);
  extern bt_status_t btif_hh_execute_service(BOOLEAN b_enable);
  extern bt_status_t btif_hf_client_execute_service(BOOLEAN b_enable);
- extern bt_status_t btif_mce_execute_service(BOOLEAN b_enable);
+ extern bt_status_t btif_sdp_execute_service(BOOLEAN b_enable);
  extern int btif_hh_connect(bt_bdaddr_t *bd_addr);
  extern void bta_gatt_convert_uuid16_to_uuid128(UINT8 uuid_128[LEN_UUID_128], UINT16 uuid_16);
  

diff --cc btif/src/btif_rc.c
Simple merge

diff --cc btif/src/btif_sock_rfc.c
Simple merge

diff --cc btif/src/btif_sock_sdp.c
Simple merge

diff --cc btif/src/btif_sock_thread.c
Simple merge

diff --cc btif/src/btif_storage.c
Simple merge

diff --cc hci/src/hci_packet_parser.c
Simple merge

diff --cc main/Android.mk
Simple merge

diff --cc stack/Android.mk
Simple merge

diff --cc stack/btm/btm_acl.c
Simple merge

diff --cc stack/btm/btm_ble.c
Simple merge

diff --cc stack/btm/btm_ble_gap.c
Simple merge

diff --cc stack/btm/btm_ble_multi_adv.c
Simple merge

diff --cc stack/btm/btm_inq.c
Simple merge

diff --cc stack/btm/btm_sec.c
Simple merge

diff --cc stack/btu/btu_hcif.c
Simple merge

diff --cc stack/gatt/gatt_sr.c
Simple merge

diff --cc stack/l2cap/l2c_main.c
index 8da881c,ef8f4bc..634f1cd
mode 100755,100644..100644
--- 1/stack/l2cap/l2c_main.c
--- 2/stack/l2cap/l2c_main.c
+++ b/stack/l2cap/l2c_main.c