Merge "simpleperf: simplify packing script zip file."