Merge "Mainline logging to statsd: native static libs"
am: fe3ebab0b3

Change-Id: I7c241f209b133ec5465a47e384528c16c4026744