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

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

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