Merge "StatsEventParcel impl.; move AIDL files"