Migrating goldfish/opengl to goldfish-opengl
am: 70a7dc8f33

Change-Id: I7ec27a90d8b3399f99e0088c452745b218c7798b