Merge "codec2,aom/Android.bp: add libcodec2_soft_sanitize_cfi" into main am:...

Merge "codec2,aom/Android.bp: add libcodec2_soft_sanitize_cfi" into main am: 71a4703a am: 9bffbb1c

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



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