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

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

Change-Id: I9aa801edb195a464c337b869045dcc16402b81c7