Migrating goldfish/opengl to goldfish-opengl am: bb4a46da7c
am: 3f4121f0b3

Change-Id: I6fe422039688b99d688b1669cf7a8045301b333f