Revert "dvm: Bring back the ANDROID_DATA override"

This reverts commit a93dc5f42829fe5d1fc9060fb8ca291ec7790a29.