Migrating goldfish/opengl to goldfish-opengl
am: baec2b5ae1

Change-Id: I05f10dda8fd6921d1f8d0f58f6019e1571ed4495