Merge "Fix windows adb build"