Fix issues to support custom SAI header#1698

Junchao-Mellanox wants to merge 1 commit intosonic-net:mastersonic-net/sonic-sairedis:masterfrom

Junchao-Mellanox:master-customer-header-upstreamJunchao-Mellanox/sonic-sairedis:master-customer-header-upstreamCopy head branch name to clipboard