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

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

Change-Id: I2b95f45285ee80188b582be9f03dbc25edbb4078