am 2d439e62: am bb1d1319: Merge "More changes to improve memory usage during rotation" into honeycomb

* commit '2d439e62a7eb16416af440b1cf1c03a615b6a0ce':
  More changes to improve memory usage during rotation