am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1

* commit '2ccc47b89868d4f39683e0e2bd057ce95d7d1217':
  Memory optimizations for libhwui Bug #5566149