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

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

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