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

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

Change-Id: I264384190bf2ef047afc6503538fd4496597ba33