Merge "SurfaceFlinger TimeStats" into pi-dev