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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie92e5265cfaa77b87f09989d997480817da37966