Migrating goldfish/opengl to goldfish-opengl
am: 2448fdcbe6

Change-Id: I802b74c1d21c60e90c5f7d7be0a70c8b7a836826