Merge "SurfaceFlinger: Get rid of String8 in dumpsys"