Merge "Enable windows builds in soong"