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

Change-Id: I1550be072b4523f215d24b5a069aebedbbaa50a7