Revert "Legacy Audio adds"

This reverts commit 32b5775b41ef4d19c061688222010d69746b6e14

Change-Id: I62a12a3feb20e8465e33aa20b22404688e7e4c91