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

Change-Id: Icb231b234bd1fd4b84a798847c2a2c9a35a90290