Merge "Fix compile errors on Android R" am: 1f82b47f38

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

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