Merge "otautil: Clean up SysUtil.cpp."