Migrating goldfish/opengl to goldfish-opengl
am: bb4a46da7c

Change-Id: I6cc8795164820c8cb53a8042c1a24a4513fc383a