Merge "logcat: modernize the code"
am: e901d3a3ee

Change-Id: Ic3b7f20c28f62f14c4b9e418e6a968a652b9771a