Merge "simpleperf: fix some errors testing on windows."
am: 1b3ca90fc5

Change-Id: Iff6845cf39860c22ea20c0826feddd8989e8ee34