Merge "Fix wpa_supplicant build with newer BoringSSL" am: 96e84352e6 am: 12405a05cf am: b551791ccf

Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1835013

Change-Id: Ic3c9be25b35c5a3b9c4680a635040277a4605124