Start cleaning up log macros.

Change-Id: I228fef0198caeb47618a07c4c46526f611933e07
7 files changed