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

Change-Id: Ie03737a72cf81e72a8bd842f9301a5ace328edac