Merge "fix eglClientWaitSyncKHR timeout" into jb-mr2-dev