Merge "simpleperf: add MapLocator for etm decoding." am: 71331274ec

Change-Id: I581f59fb7550c19a5350db3e741fdf01045b6639