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

Change-Id: I4132d408a1ce4d586331f73fe6668081ddebdddb