Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so."