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

Change-Id: I524bef42063ca3e63e5f6532da636dc0469d30ae