Merge "fix mac sdk build."