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

Change-Id: Id5d90a39ab012dc92e849e37dd1fb72c419bb368