Clean up my sloppy commit
-thanks tony

Change-Id: Ida6584105f5f872cb7ae46f50204037c773b2ef1
use our mediaprovider

Change-Id: I868f613e25afbe3022c2502fdca8051ba450869a
fix my derp

Change-Id: Ibbb8c2f3907a27f75494d7f51814b9a5f51222cf