Merge "liblogcat: avoid double close." am: 76ecdd6a95 am: e79d41bf0b
am: 0174e7019b

Change-Id: I1bc899305fabef394f76926f3eee24671743dd60