Merge "Revert "Fix a bug in VP9Worker which leads to unit test hang.""