Migrating goldfish/opengl to goldfish-opengl BUG:32183368 Change-Id: Iba7ec42ceeebd962e694513236a1b907d87b12c7 (cherry picked from commit d05fd8d33e9eb1870b4c6e3b2515183d9c77b88a) (cherry picked from commit 90ca9ef87fd2c7ff6cea1a72cff64275dcf96d64)