Merge "Revert "Enable cfi in hevc library""