Merge "Suppress implicit-int-float-conversion warning" am: 381ffccf4b am: 81949bc800

Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/2183508

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