Merge "Codec2 base components cfi assembly support" am: 75981d60 am: 290508c5 am: 44be9597

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40954639b776216a8c01515346ed31c333a53154