Merge "Simpleperf: Fix perf_data_path config" am: 21c00a2378
am: d3d3a4e653

Change-Id: I1b683289646d16b8dd8fb147c8bedef485505ae4