Merge "logcat: -v thread help missing" am: 3cfc1ab89d am: 6f9051ea1b
am: 6b05d269a3

Change-Id: I52ca7c084c8878212c49e7c5b9c44019c6b04f12