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

Change-Id: Ifff29521d615fe05765808912fc582b1f81862dc