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

Change-Id: Ie698eb0bc2cc05c2daf54983542ee059005e5c1f