Merge "simpleperf: support building sample record manually." am: 9ffbb8321e
am: 2b7704df9b

Change-Id: I15157f5ad0ddd9194170f84c8a0e9425daba886a