Merge "Rename HWUI memory atrace counters"