Merge "simpleperf: add META_INFO feature section in perf.data." am: 3fb00aedf2
am: 9e63c11291

Change-Id: If9c4155aac1273bad9c4db1137b60e065a8933bc