Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"...

Change-Id: I22fb89a33d6265470d4dc82a19d3ff66ce1ad9fa

diff --cc stack/btm/btm_acl.cc
Simple merge

diff --cc stack/btm/btm_int.h
index 76b05ef,a71af77..e6e0dff
--- 1/stack/btm/btm_int.h
--- 2/stack/btm/btm_int.h
+++ b/stack/btm/btm_int.h
@@@ -114,10 -110,9 +114,10 @@@ extern void btm_blacklist_role_change_d
  extern void btm_acl_encrypt_change(uint16_t handle, uint8_t status,
                                     uint8_t encr_enable);
  extern uint16_t btm_get_acl_disc_reason_code(void);
 -extern tBTM_STATUS btm_remove_acl(BD_ADDR bd_addr, tBT_TRANSPORT transport);
 +extern tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr,
 +                                  tBT_TRANSPORT transport);
  extern void btm_read_remote_features_complete(uint8_t* p);
- extern void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len);
+ extern void btm_read_remote_ext_features_complete(uint8_t* p);
  extern void btm_read_remote_ext_features_failed(uint8_t status,
                                                  uint16_t handle);
  extern void btm_read_remote_version_complete(uint8_t* p);

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

diff --cc stack/include/hcidefs.h
Simple merge