Revert "Squashed commit of A/V changes from CodeAurora"

This reverts commit 1216ed8d00080619bb04c398bb0072945c58511b.