Revert "dvm: Bring back the ANDROID_DATA override"

This reverts commit 500f755ed8d968f7398f0446ba6bc15da44ca3a6

FC after boot.

Change-Id: Id6a76f48592c6e6294112e0a5edb715d8aad3806
Merge "Revert "dvm: Bring back the ANDROID_DATA override"" into jb-mr1