Migrating goldfish/opengl to goldfish-opengl
am: c30795ed4e

Change-Id: Ie1aadf2ff387fc66ba918d3a089caf69751e23fc