Merge "libutils: include what you use" into oc-dev