Merge "[build] Fix strict prototype warning with latest Clang." am: 3c6a6648bf am: d7cf183a51 am: 8a9e78937a

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2063272

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