Merge "Enable cfi for libvpx"