Merge "simpleperf: add 'event_count' field in report proto." am: 7d8e85589c
am: e848471461

Change-Id: I01bf0ba09668cc909dd43c7e59af8796a36efada