Merge "Enable cfi in hevc library" am: b31c795682 am: 1e11774fd2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idda8b9ec186a312be5bce38fe100f0204fc2dca9