Merge "SurfaceFlinger: add more cleanup to unittests"