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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93bdce1b5e6d4e8f7af92c93a9b4b05ef19c756b