Merge "base: adb.exe build error"