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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If69c2da243f06e2eadbc90d1f51070380a87d0f2