Cleanup lib/util file headers.

Change-Id: I6fb37fc1c1774373f82554bf94caa02834dba591
Merge "Cleanup lib/util file headers."