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

Change-Id: I6edf3e87dcf56a0ba5f90276f7f7e5f38f157b9e