back to aosp mediaprovider

Change-Id: I44013e34139e26552d1971e3e6c333372249470b