am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2

* commit 'b16a6d6e1d451abb68ae9e127ae8d5e77627f2f3':
  DO NOT MERGE Fix rotation and memory use bugs