Merge "Enable cfi xaac libraries" am: d46a259d34 am: 9725538e80

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4f272195c1f6df1a9d5671a9b365e6ba192ca2d