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

Change-Id: Ifac625defc04d013817853e80491e29130c71cac