Merge change 26925 into eclair

* changes:
  minor SurfaceFlinger code cleanup and remove unnecessary tests