am 20daf003: am db57cfbd: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev

* commit '20daf003aaf1f01d5ef3cd60306db3cff89512c8':