Revert "Legacy Audio Adds"

This reverts commit 7873fb1cda89d4a7e83e7e7a8518a5090db6cf97

Change-Id: I777c0bdda6b6ff591cd15ac34805e4a490c6854b
Merge "Revert "Legacy Audio Adds"" into jellybean