Changes to reduce the size of linux build