Migrating goldfish/opengl to goldfish-opengl am: b676b41d81 am: 7492cfbd0e
am: dac918b4cd

Change-Id: I6df3beae2ab162a89c65f07596468e163a5adc96