Merge "Remove IStatsCallback aidl from master"