Merge "Enable cfi in hevc library" am: 6a56a14e7d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80934ee94a080dc529b3dc39efa31ef3175d03df