Merge "Update installd for logwrapper"
am: 2cf75a4780

Change-Id: I3c1b0f94de16cb6d69e3ea8a29429fe56f5122be