Merge "Revert "Enable cfi in hevc library"" am: cd13efa9d8 am: 26bb5dafd3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I161d41ab2ff46b153c12805480a5dd3a5ec267ea