Merge "simpleperf: fix building simpleperf_script.zip."
am: 88fed2d53e

Change-Id: I79dedd05ddf937726e11d164d78c306409490b04