Merge "liblogcat: measure performance" am: 8a3a166066
am: 38d33010d0

Change-Id: Ib034328eb52c69123fe24db9f12c663f5319510a