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

Change-Id: Iadb32fece7fb7f10193e6210c6ad2ed3b7de35d5