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

Change-Id: Iadea8c0623ad6e8ffbc2b39d3131295cb61b53ec