Migrating goldfish/opengl to goldfish-opengl
am: 8ff4478d8a

Change-Id: If7c04c9a32e342fe5de49a9dc8c26a3d5da912c2