Migrating goldfish/opengl to goldfish-opengl am: 8ff4478d8a am: ce7b6f79db
am: 15ea4f029b

Change-Id: I1b5b9cf1d156bf845cc26fa0c9aad8866450652f