[automerger skipped] Build /vendor/bin/logwrapper too.
am: 5a4c20bc21  -s ours

Change-Id: Ic5235676fa58664982bf6885eadf1612b2d2deb4