Merge "simpleperf: Add merge cmd." am: b9c234c4db

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1473322

Change-Id: Ib51439392c0696d619dc22d125cb44816e88f945