Merge "logcat: remove the rest of liblogcat" am: 20d02ca458
am: f6fb4303d0

Change-Id: I982b7ee0a20cfc4e9556f288c0604b2de99d0837