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

Change-Id: I10d3c6feb63dc5a515ec8f5eadb3ca54d6d63e95