Merge "Move logwrapper to shell_and_utilities."
am: 3204fd4bed

Change-Id: I454844357e9d190aaf89d0fd74f6ceb27a54d7b8