Merge "opengl: fix a race condition when unloading gl driver" am: e380e5d82f
am: b9a4f9efdd

Change-Id: I2b32e834d52bc7321d36abd0f1984980fab6a9df