Merge "simpleperf: stop recording when app exits." am: 7383649ebc
am: 4f66d47be9

Change-Id: I74d4444bd1a155f2c05947b72e9c50be9003b52f