Merge "Fix an incorrect && with kTraceCountAllocs flag."
am: 651184bdcf

Change-Id: Icdc5a3d063b415646381b83b27d6b03d8a9dea3e