Merge "Revert "surfaceflinger: work around dumpsys lockup"" into oc-dev