Merge "libstats: remove copy of cruft removed from liblog."