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

Change-Id: Ieb092da172224dc669191943886957adc87dfd65