Use platform/development from AOSP

Change-Id: I90d682d07913340e841c8c78d9f00e6dbfcff757