Merge "otautil: Drop a few unneeded includes." am: 36f72131ff am: 7f9eb2e012
am: 78506ddf1a

Change-Id: I37d895c5d35fb9c9435e5bed838c524fb0fa0f17