tree e9d2d673bc83cec8b5828cc3739dc4796fbefa3a
parent 14aa5d3541125b8b5da0968d302cc60df0340687
parent aab8125d7c46a7b438229000a869f6b53947f960
author android-build-team Robot <android-build-team-robot@google.com> 1618928614 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1618928614 +0000

Merge cherrypicks of [14250604] into mainline-media-swcodec-release

Change-Id: I2049906924a51a017a2776d9216e38befe134853