Merge "fix static-analyzer logging/CHECK macros"