use our media provider

Change-Id: I84da35815a1b7c1755594811953ba5f4137eb1fd
Merge branch 'cm-11.0' of https://github.com/superatmel/android into cm-11.0