Merge "Simpleperf: Support record --"
am: d01f9dd649

Change-Id: Ib70af9686c725e1bc863869ea481510da7586ea0