Merge "Update media_codec_sw.xml" am: c92e96da am: 613cba73 am: 733734e1

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



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