Migrating goldfish/opengl to goldfish-opengl am: baec2b5ae1
am: a33d861b94

Change-Id: Idd4ff31d45aac8a1b8223adb1f1a350fc5769c75