Merge "fix [2189862] Race condition in eglIntialize and eglDestroy"