Merge "simpleperf: fix CanRecordRawData." am: b9595be281 am: 5bb9c44fd4

Change-Id: I357c457dce8fcda6e37016c01d05dc7e2956de11