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

Change-Id: I008c069aa5a1538d90217d186819d629f4eeacf1