Merge "Fix an incorrect && with kTraceCountAllocs flag."