Merge "simpleperf: add more device info in recording file." am: b8c63387c5

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1706486

Change-Id: I72739008af0bc074c0fc1d7f90a77460e84abf0b