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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie557fa4fe87ce625ea30884650eda37706642b13