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

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

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