Merge "Codec2 base components cfi assembly support" am: 75981d603d am: 290508c59f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8196fa7d69098be16b15a3a7c203559f07adaf24