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

Change-Id: Ie1e931c85ea129bd4cd17f5a08cbf710d85d307b