Merge "Add empty <util.h> to build BSD source."