Merge "goldfish-opengl: nuke use std::optional" am: b3b18a3b44

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

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