Merge "simpleperf: fix --group option." am: ac07d6eb1e am: ed5fb60e00
am: f033197e6c

Change-Id: I2f833e9a7792e0fb159eb7f8f215f0e341b41b6d