Merge "adb: win32: fix ReportServerStartupFailure"
am: 484f72abbf

Change-Id: Ie7645f3ba9145e6e36baa5e4888406c77b34e0f9