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

Change-Id: I35ecaee6dada5341d563f01915286324d07ec7f4