Merge "logcat: modernize the code" am: e901d3a3ee
am: 5a96e77dce

Change-Id: I3ad5d9d8c7af9087951d398c7a5d11b20d2ad1cd