Merge "libstats: remove copy of cruft removed from liblog." am: 22e6759102
am: bf982596b6

Change-Id: I46aba044d7546e7b1bfe25a8881d830bd5551551