Merge "Fix VPX_KF_DISABLED."