resolved conflicts for merge of a7d7eb78 to master

Change-Id: I547dbf3c212eb5658c43f9822587431a7bcbbac3

diff --cc hci/Android.mk
index aa9083a,fac6a42..24b851b
--- 1/hci/Android.mk
--- 2/hci/Android.mk
+++ b/hci/Android.mk
@@@ -31,9 -27,9 +31,10 @@@ endi
  LOCAL_CFLAGS += -std=c99
  
  LOCAL_C_INCLUDES += \
-         $(LOCAL_PATH)/include \
-         $(LOCAL_PATH)/../utils/include \
+       $(LOCAL_PATH)/include \
+       $(LOCAL_PATH)/../osi/include \
 -      $(LOCAL_PATH)/../utils/include
++      $(LOCAL_PATH)/../utils/include \
 +        $(bdroid_C_INCLUDES)
  
  LOCAL_MODULE := libbt-hci
  LOCAL_MODULE_TAGS := optional

diff --cc hci/include/bt_hci_bdroid.h
index ac2f162,a3c2028..37bcdd8
--- 1/hci/include/bt_hci_bdroid.h
--- 2/hci/include/bt_hci_bdroid.h
+++ b/hci/include/bt_hci_bdroid.h
@@@ -66,18 -62,10 +66,9 @@@
  #endif
  #endif  // (BTHC_LINUX_BASE_POLICY != SCHED_NORMAL)
  
 -#ifndef BTHC_USERIAL_READ_MEM_SIZE
 -#define BTHC_USERIAL_READ_MEM_SIZE (1024)
 -#endif
 +#define HCI_ACL_MAX_SIZE 1024
 +#define HCI_MAX_FRAME_SIZE (HCI_ACL_MAX_SIZE + 4)
  
- #ifndef BTSNOOPDISP_INCLUDED
- #define BTSNOOPDISP_INCLUDED TRUE
- #endif
- 
- /* Disable external parser for production */
- #ifndef BTSNOOP_EXT_PARSER_INCLUDED
- #define BTSNOOP_EXT_PARSER_INCLUDED FALSE
- #endif
- 
  /* Host/Controller lib internal event ID */
  #define HC_EVENT_PRELOAD               0x0001
  #define HC_EVENT_POSTLOAD              0x0002