Merge "Remove libmetricslogger_static" am: 6d7c8fcc92
am: 6d71ef44b1

Change-Id: Icb845e3c220dc250b21d3cba1ab2e7f53e23b268