Revert^2 "Add SPEAKER_CLEANUP system usage"

4a7600084b8e7f45ba9c1791b1936d66a2d5434b

Change-Id: Ib62dd0b43f5bd8f04c901b8afbdc80b544149906
2 files changed