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

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

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