Merge "improve SurfaceFlinger 'dumpsys' log" into honeycomb