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

Change-Id: I2b85722b11aeffed7cfb69fea3ffaad932303280