Merge "simpleperf: fix help msg." am: 9179b91e6a
am: f71512eb46

Change-Id: I084927615df9e7fcbb9c4dd925b93d8fe53ac961