Merge "Clean up some build warnings" into main am: 8441f7503b

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

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