Merge "Mainline logging to statsd: native static libs"