Revert "Revert "Shrink surfaceflinger""

This reverts commit 9b240e74075a316ccbbe1b0c2b96b8fc44f5aa65.

Reason for revert: Build issues should be resolved with aae69c45979dc000cd6dfb83f69e21c2d760339a and 9015e0f59b2f925711b0b55618cb065e44e627ca

Bug: 168077202
Change-Id: I2051fd4101aef5a6a0ad16c397b29d9fe9a6b8df
2 files changed