Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2