Merge "simpleperf: fix build id in pprof_proto_generator.py."
am: 939a46d25c

Change-Id: I694d9b6f0621103a3309d91b6accd831b26adc5d