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

Change-Id: I9d992c7e7816f813ef392e7b5c7d03f53627ae81