Merge "Enable cfi in hevc library"