Merge "Make libstatslog static-linkage compatible." am: 871d5592ff
am: 33f59669ff

Change-Id: I7cd6f59420efb7fb323d91bcfab91cdb0213d13c