Merge "otautil: Fix mac build." am: eb8a064066
am: bc131ef1bd

Change-Id: I610fad4289df35d0327ecdd91c271a90f0dd45df