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

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

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