Merge "simpleperf: fix more recording time than requested."
am: 2e6a087ea5

Change-Id: I32b4f27652783a07b9f023d91abfbed6125eb76f