Merge "fix cts failure in Vp8EncoderTest#testAsyncEncoding" into lmp-dev