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

Change-Id: I2673095ee33e437ad2e52a85e38dfc5868718dce