Migrating goldfish/opengl to goldfish-opengl am: 2448fdcbe6 am: 773ea33491
am: 03b4192ab5

Change-Id: Ic9a86ed8f8d725964e6381ed597a4e810cc90e61