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

Change-Id: I5a4e7cbf5e86dea17db4b9d8048775bf46f45404