Merge "Remove StatsEvent.h/cpp and StatsEvent.aidl"