Merge changes Ie05c683e,I47026cac

* changes:
  simpleperf: Remove stack and reg fields in samples after unwinding
  simpleperf: Store perf_event_attr value in EventAttrWithId