Merge "Because nested defines breed bugs"

  uint8_t resolving_list_index;

#if (BLE_PRIVACY_SPT == TRUE)

  RawAddress cur_rand_addr; /* current random address */

  uint8_t active_addr_type;

#endif

#define BTM_BLE_ADDR_PSEUDO 0 /* address index device record */

#define BTM_BLE_ADDR_RRA 1    /* cur_rand_addr */

#define BTM_BLE_ADDR_STATIC 2 /* static_addr  */

  uint8_t active_addr_type;

#endif

  tBTM_LE_KEY_TYPE key_type; /* bit mask of valid key types in record */

  tBTM_SEC_BLE_KEYS keys;    /* LE device security info in slave rode */