Migrating goldfish/opengl to goldfish-opengl
am: 5f29a14dc6

Change-Id: I218e22ca440eddab7962d31be0fde08bca275669