Merge "simpleperf: fix pprof proto generator."
am: d2b7f6afe5

Change-Id: Ife8a2d885ed454537b8ebde08516351ac41156a6