[automerger skipped] Merge "Mainline logging to statsd: native static libs" am: fe3ebab0b3 am: a99fe6e2bf -s ours
am:2f052818b1-s ours am skip reason: change_id I78064f81fb4971eede8e97dacce5424e3eefd8bb with SHA1810eeb3eedis in history Change-Id: Idab220969ae45b9f6769780d8236c913efef5137
This commit is contained in: