Migrating goldfish/opengl to goldfish-opengl am: 2448fdcbe6
am: 773ea33491

Change-Id: Iefe50ac3130a66acefce5c0d8bb6fec311ae7c0a