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

Change-Id: I006c2578e0cb551d32b7d920241f7a51d1247485