Revert "Fix DSPManager"

This reverts commit 9fa482b79827b354414b28708dd2606a1b619e05.

Change-Id: I34987c906ef58bccfdbf955528f628bf70f52a68