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

Change-Id: I8f62deff82ecfae0c69aeb6fc8d8842f87690332