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

Change-Id: If7f6cee9c676c394545403bc4591402ab74e3887