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

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

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