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

Change-Id: Ia5026666de14d08f1e0090cb8807d8e38f53e593