am 35e6d686: (-s ours) am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)

* commit '35e6d6867c63ad254e95325206aa7a927edd6797':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)