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

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



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