[automerger skipped] Merge "SurfaceFlinger: add RootTargetPreparer to SurfaceFlinger_test" am: 38e2dd48 am: d663f215 -s ours
am skip reason: Change-Id Ie144891f1c413a18b705f560d70d23041d36772b with SHA-1 d36263a0 is in history
Change-Id: I931ea3d52142092fa245c511a60833ff632c3e22