Merge "Fix linux sdk build."