Merge "Rename HWUI ATRACE memory counters"