Merge "SurfaceFlinger: Last minute log removal." into oc-dev