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

* commit '2123c6fc300b74eb17b35690f41a19e1d53b7c30':
  Add empty <util.h> to build BSD source.

Change-Id: Ib0e8ca0aea64dfa0f4deae2b92f6cf477ac3f541