Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc...

Change-Id: I0767ba267fc51a926930288752a1a079414d5a76

diff --cc stack/btm/btm_acl.cc
index 07a80fb,d9720c7..34041d6
--- 1/stack/btm/btm_acl.cc
--- 2/stack/btm/btm_acl.cc
+++ b/stack/btm/btm_acl.cc
@@@ -44,9 -44,9 +44,10 @@@
  #include "btm_int.h"
  #include "btu.h"
  #include "device/include/controller.h"
 +#include "device/include/interop.h"
  #include "hcidefs.h"
  #include "hcimsgs.h"
+ #include "log/log.h"
  #include "l2c_int.h"
  #include "osi/include/osi.h"
  

diff --cc stack/btm/btm_int.h
Simple merge

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