Merge "simpleperf: fix dumping build id." am: 6f5984af9e
am: ce69042ed2

Change-Id: I9770d8c91e396512ce93de44ae584e5a7ff18fe7