Split out libraries from util.h

Change-Id: I4385364d5012c50aff6bde5bdbdb0cca174fd984
Merge "Split out libraries from util.h"