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

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

Change-Id: I9afd31c5e4e3b624dec55eaf5ba09aea58712f07