am 82eccf61: am 3c59e8e4: am 1613f475: am 0f1613c8: Merge "media: Refactor and improve robustness of AdaptivePlaybackTest" into klp-dev * commit '82eccf61': media: Refactor and improve robustness of AdaptivePlaybackTest