Revert cleanups to fix the build

Revert "Cleanup."

This reverts commit 62afe52dd9bc6d484565a851a9f31487406b58cc.

Revert "Fix SystemUI memory leaks on theme changes."

This reverts commit 13d9ed5dbb9e76df36a5e0858d8d01622dc761ee.

Revert "QuickSettings: cleanup"

This reverts commit abfdc5df4a9aa0ae25ec287c62c2e5ef28f0e8bb.