Merge "Allow system server to add StatsHal"