Merge "Build /vendor/bin/logwrapper too."
am: af15fbf9aa

Change-Id: I38612acc94b4379768513b6f13f31d07faaf9f4f