Merge "simpleperf: add tests recording real apps." am: 0edad652cf
am: db0bd5e4d5

Change-Id: Iaf619b6195267ae8caf75d3f11aa306116b5945f