Video killed the radio star? Well, I killed Video(s)......RIP radio star! :)

Yeah I'm bored but hey....at least the ROM is 10 MBs lighter!

Change-Id: I51b5eaf84115571b73ac01e57371a4934e4320c8
Merge "Video killed the radio star? Well, I killed Video(s)......RIP radio star! :)" into jb-mr2