Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom