Merge "Make libstatslog static-linkage compatible." am: 871d5592ff am: 33f59669ff am: 1c8ca2b2cc
am: 4de16c7cee

Change-Id: I2369b099598ae467cdd5a9ec5df244b9476076aa