Merge "Update installd for logwrapper" am: 2cf75a4780 am: ae78736189
am: 4ab3371f88

Change-Id: I7648dd45f5b603df59889652ac9540e7c03de38f