Merge "Mark swcodecs with software-codec attribute" am: 0d9969705d am: 417b33b8d0 am: d9f3afb431

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

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