Migrating goldfish/opengl to goldfish-opengl am: bb4a46da7c am: 3f4121f0b3
am: 167f50d83a

Change-Id: Ibb8fb79f78a0c08e929fd33e4e4d46ff50b73f5c