Merge "logcat: remove unused enum and #def" am: 89bdf1f26f
am: 095c99d4a3

Change-Id: I6f799badf6e2a35a6e0ce61ff3c776968b9e1cef