[automerger skipped] Merge "opengl: fix a race condition when unloading gl driver" am: e380e5d82f am: b9a4f9efdd am: 31397a6eee
am: 1d177631d6 -s ours
am skip reason: change_id Ica5b19edc0dfb0a0910f56c1442eaff63f76b35a with SHA1 86f9f749cc is in history

Change-Id: I1bbc6f12ce0c8f944a692a169b1d76344985bd5d