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

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

Change-Id: I6a45eed71f10b65012ef2e0b49a9711f2fb5251c