Merge "[SurfaceFlinger] Replace android_dataspace with Dataspace." into pi-dev
am: 2e14fbae72

Change-Id: I6ecfd6fa8f67ed165547fda10b05ee7fdf07828d