Migrating goldfish/opengl to goldfish-opengl am: b676b41d81
am: 7492cfbd0e

Change-Id: Iee359597a44ccb2f73f5ce0a4617dd5d8532d66a