Merge "Fix wpa_supplicant build with newer BoringSSL" am: 96e84352e6 am: 12405a05cf am: b551791ccf am: 0c865a7045 am: 3955b2c7f7

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

Change-Id: I222a277d15067dafa8dfaaed2de77769b0141c70