Merge "Fix for compilation error on 32 bit builds" am: e7938d7f2e am: c1d7467b83 am: cb853ac1a0

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

Change-Id: Iabf2865aec778bed4ca8395d319cd8e5ba55fa0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>