Merge \"Simpleperf: add vaddr_in_file sort key in report command.\"
am: 5f99cdc04b

Change-Id: I3fcd9d63a592f1e30b3623448124f33f22091840