Merge "Update installd for logwrapper"