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

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

Change-Id: I3326cb57303a26c78bed7e4058237d145f152e12