Merge "Set the default ring buffer size for stats log, and set it loggable." am: adbaeb0c1d am: 2e006b7dc8
am: 5783f2beca

Change-Id: I8c4b41e0af440f759e783728b43b35555c0cec75