use our own development & media provider

Change-Id: I3573a9fa834a21b58f6983e173df080e2c8b863b
Merge branch 'kk' of https://github.com/CarbonDev/android into kk