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

Change-Id: I087ac29945dbd5aa992afb14679e661569564f64