Adjustments made to build against new SurfaceFlinger