Revert "dsp: merge from shooter"

This reverts commit 6d07046c2509b3a349624bb6c182f0ba2e09ed91.
dsp: merge from shooter (correctly)

Change-Id: Ie6e3621d8e2e30e4cd9c358fbb9f6a851e8a9d6e