Merge "Revert "Revert "allow simpleperf to profile more app types."""