Merge "Update media_codec_sw.xml" am: c92e96da7b am: 613cba739b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2605145

Change-Id: I7e8142865a6c5eb60186c9ec8280a8d9443504b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>