Migrating goldfish/opengl to goldfish-opengl
am: b676b41d81

Change-Id: I2a3c3d7648ad6bbc3b0959f0fa8e314b2e558220