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

Change-Id: I37212ffbb0a984ec5b7874d2c6a12689f38ca14a