Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1