Merge "simpleperf: add --show-features option in list cmd." am: 2ad09b2ffd
am: 1d592300f8

Change-Id: I9c6b0b7e38229c869d7acea88cb314130219f86c