Merge "Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62 am: bce8cee6...