Merge "SurfaceFlinger: add RootTargetPreparer to SurfaceFlinger_test"