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

Change-Id: I4df5680b4f174df2050aac19d58989969543f9d5