goldfish-opengl: be more platform agnostic with am: a81c85ea67 am: b2649c1736

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

Change-Id: Id942473e3f7db6c1f30a7614931d81ed760e90f0