Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23
am: d9d435cd83

Change-Id: I5b1882758ae438cc6dd6a4926d20a04ece594032