Merge "Run SurfaceFlinger_test as part of Skia presubmit"