Merge "logcat: tidy "logcat.h"." am: 9040b888a6 am: 9d943bc128
am: 556c587ce2

Change-Id: I618fbc4f9fc099ce5374b528189b12621cfccdd7