Merge "logcat: remove unused enum and #def"