Merge "[SurfaceFlinger] Make sure data space is set correctly" into pi-dev
am: c9340b63a8

Change-Id: I626dd5c8229d1b366d427d2a8c588f590d56509c