Merge "SurfaceFlinger: add RootTargetPreparer to SurfaceFlinger_test" am: 38e2dd48cf

Change-Id: If118563a8cfc3d14de57e7b0ec31b9936f626fea