Merge "SurfaceFlingerPerfTests: Buffer clean up for SurfaceFlingerPerfTests."