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

Change-Id: Ia4ffcf646f5e79e4104b722f94b198faaecdef0a