am b9c932ba: Merge change 26925 into eclair

Merge commit 'b9c932ba1203b477abbb0695d8b7162f45b4e91e' into eclair-plus-aosp

* commit 'b9c932ba1203b477abbb0695d8b7162f45b4e91e':
  minor SurfaceFlinger code cleanup and remove unnecessary tests