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

Change-Id: I234ad72233c4e1dc9bd7460bb50f20dced39d693