[automerger skipped] Merge "Build /vendor/bin/logwrapper too." into pi-dev
am: c8014f7e54  -s ours

Change-Id: Ic8a49ebbf4dbd0bff5400a21aaca8a19f61f1f9c