Merge "stats_event.h/c tests"
am: 4169e9e47d

Change-Id: I917ffcefc86909e799abe8b6af33ea1c5b146359