Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1