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

Change-Id: I52420aa2efbd1e063d089fe793b84d5d0364575c