Merge "Add empty <util.h> to build BSD source." am: 2123c6fc30 am: c9b30cf994
am: 9a5385234f

* commit '9a5385234f658b79a4b74bb16a6709bd496b9687':
  Add empty <util.h> to build BSD source.

Change-Id: I728c372e398dec78e3b462a4310bdb706b872108