Merge "simpleperf: fix building simpleperf_script.zip." am: 88fed2d53e am: 8a8568e7b9 am: 3f97e890b7
am: 6218b88341

Change-Id: I6d4a83c400c3b84ef6d0b810eef8295a71eb74d6