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

Change-Id: I0590a73880f00fda0dd3493b410fb0d0832e9485