Port build config parts of bug 597064 to comm-central to fix Mac universal build bustage. rs=straight port by build peer