Update perf data with both hardware and software events

Also replace the "cycles_and_branch" data file with a "hw_and_sw" data
file.

BUG=none
TEST=unit tests pass

Change-Id: I9b3fce27017f8126fabf9f1c4e5b873177b9c53b
Signed-off-by: Simon Que <sque@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/200826
Reviewed-by: Emma Rapati <rapati@chromium.org>
22 files changed