Merge "AdaptivePlaybackTest: dequeue more output buffers at the end." into marshmallow-cts-dev