[automerger skipped] simpleperf: add MapLocator for etm decoding. am: 10f527cb16 -s ours

am skip reason: Change-Id Ic285f81ac05c3e65b481fb97a5355282639692e4 with SHA-1 418ba0d375 is in history

Change-Id: I7b465b8fbf85223dbecea535fff021ba00ee7a4e