Merge "stats_event_list changes for statsd mainline api"
am: f95468d329

Change-Id: Ibd5d278f6af65a3c63bb97f6e5cf1b7b60180e4d