Revert "dvm: Bring back the ANDROID_DATA override"

This reverts commit 500f755ed8d968f7398f0446ba6bc15da44ca3a6.