Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid

# Conflicts:
#	components/bt/bluedroid/stack/btu/btu_task.c

diff --cc components/bt/bluedroid/stack/btu/btu_init.c
index 85a8c8a589dde87aa1e00e27587e253a7b5b8220,9831263d586c215ac6db6daf185ab1838d4d53f3..c9d21dd758440b8454821dd428a40648904270c7
--- 1/components/bt/bluedroid/stack/btu/btu_init.c
--- 2/components/bt/bluedroid/stack/btu/btu_init.c
+++ b/components/bt/bluedroid/stack/btu/btu_init.c
@@@ -193,9 -187,8 +193,9 @@@ void BTU_StartUp(void
      if (btu_l2cap_alarm_queue == NULL)
           goto error_exit;
  
-     xBtuQueue = xQueueCreate(15, sizeof(void *));
 -    btu_task_start_up();
 -
++    xBtuQueue = xQueueCreate(30, sizeof(void *));
 +    xTaskCreate(btu_task_thread_handler, "BtuT", 8192, NULL, configMAX_PRIORITIES - 1, &xBtuTaskHandle);
 +    btu_task_post(SIG_BTU_START_UP);
  /*
      // Continue startup on bt workqueue thread.
      thread_post(bt_workqueue_thread, btu_task_start_up, NULL);

diff --cc components/bt/bluedroid/stack/btu/btu_task.c
index 50c96ca6512e617465480ec364bff6782385f42a,1d419fd845be026d4d21c4e0f168f5a553b134a2..3476ad4ed1d8f0f645c10b51a94d6b3562f483f0
--- 1/components/bt/bluedroid/stack/btu/btu_task.c
--- 2/components/bt/bluedroid/stack/btu/btu_task.c
+++ b/components/bt/bluedroid/stack/btu/btu_task.c
@@@ -345,7 -345,10 +345,6 @@@ void btu_task_post(uint32_t sig
  }
  
  void btu_task_start_up(void) {
--//  ke_event_callback_set(KE_EVENT_BTU_TASK_THREAD, &btu_task_thread_handler);
 -
 -  xBtuQueue = xQueueCreate(30, sizeof(void *));
 -  xTaskCreate(btu_task_thread_handler, "BtuT", 8192, NULL, configMAX_PRIORITIES - 1, &xBtuTaskHandle);
  
  #if (defined(BTA_INCLUDED) && BTA_INCLUDED == TRUE)
    fixed_queue_register_dequeue(btu_bta_msg_queue, btu_bta_msg_ready);