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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9423a9a68e232c0a096bfd947d6d03af2a51fbd