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

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

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