am 90858601: Merge "fix eglClientWaitSyncKHR timeout" into jb-mr2-dev

* commit '908586017eb6cc5227b3830d929d90406d514a52':
  fix eglClientWaitSyncKHR timeout