resolved conflicts for 955abac9 to master

Change-Id: If3f90984c5ca906bab2fd6df7d77b4dfec47115e

diff --cc osi/include/eager_reader.h
index 542df45,a172f06..49fe948
--- 1/osi/include/eager_reader.h
--- 2/osi/include/eager_reader.h
+++ b/osi/include/eager_reader.h
@@@ -22,7 -22,8 +22,8 @@@
  #include <stddef.h>
  #include <stdint.h>
  
 -#include "allocator.h"
 +#include "osi/include/allocator.h"
+ #include "osi/include/thread.h"
  
  typedef struct eager_reader_t eager_reader_t;
  typedef struct reactor_t reactor_t;

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