Migrating goldfish/opengl to goldfish-opengl am: c30795ed4e
am: f4ac4ebcca

Change-Id: Ib18aaae7f6c3d84b8a5a2687491bdbd52addde02