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

Change-Id: I67cfddf183f45711c158faf47a789353438c0be6