[automerger skipped] Merge "stats_event.h/c tests" am: 4169e9e47d am: d31aea7383 am: 6511537832 -s ours
am skip reason: Change-Id If427c17319787200260cbe3b71075ca556c9a82b with SHA-1 21c1f9c314 is in history

Change-Id: I1ed4da920bfa6f813cb4bfbf3155484a12e8fa0e