cleanup media variant ifdef

Change-Id: Iedc6cfcaa6706c6614a638cede7fd560d104d8a2
Merge "cleanup media variant ifdef" into jb4.3