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

Change-Id: I26a275dbfd94d416607eb8a5bbb623b84b4f9042