Merge "Fix compile warnings" am: cb93af3597

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

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