Merge "Fix standalone windows build" am: 7b8ff24c28

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1913325

Change-Id: Ib3332a18cb6b68a74de59c1860a902c30a5a2132