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

Change-Id: I0afe0ede622999041a423e1b92187dbda3940f9e