Merge "simpleperf: Keep record time and android version in perf.data." am: c34215a771
am: 7c08170f86

Change-Id: Ibd9430cf3fcff44eae0ff49426903659289d0d28