Merge "logcat: tidy "logcat.h"."