Merge "Add guest mode functionality (2/3)" into mnc-dev

am: 4439d380e5

* commit '4439d380e5e2ec3c24b04f7eba1bcbceae78191a':
  Add guest mode functionality (2/3)

Change-Id: Ia13560babbc18e2ee290e16f9b03fb5202894c23

diff --cc btif/src/bluetooth.c
index 8863f75,5ee48d3..b4d5a62
--- 1/btif/src/bluetooth.c
--- 2/btif/src/bluetooth.c
+++ b/btif/src/bluetooth.c
@@@ -50,12 -50,12 +50,13 @@@
  #include "btsnoop.h"
  #include "btsnoop_mem.h"
  #include "bt_utils.h"
 -#include "osi/include/osi.h"
 +#include "device/include/interop.h"
  #include "osi/include/allocation_tracker.h"
  #include "osi/include/log.h"
 +#include "osi/include/osi.h"
  #include "stack_manager.h"
  #include "btif_config.h"
+ #include "btif_storage.h"
  
  /************************************************************************************
  **  Constants & Macros