Merge "adb: replace utimes() with utime()"