Merge "Suppress implicit-int-float-conversion warning" am: 381ffccf4b am: 81949bc800 am: 18318cfb38 am: 9b5cc91a90

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

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