Migrating goldfish/opengl to goldfish-opengl am: 5f29a14dc6
am: e37f68dde3

Change-Id: I4583d87021a798f72afbc21102e8f6e89de9b870