Merge "simpleperf: add test to app recording api." am: 2df128973c am: 1bdcfe465e

Change-Id: I943bbf0a1c09eba8dcc26cdc14f81196c71cfeeb