Merge "Fixes Mac build error where it's missing proper sys/types.h"