media: Cleanup some unnecessary old code

Change-Id: Id204180026b701bbf4c565c34a6fbba8b120eb0a
Merge "media: Cleanup some unnecessary old code" into kitkat