Revert "Revert "dvm: Bring back the ANDROID_DATA override""

This reverts commit a3b5269e8ef27a2db40c6914a4ac211caaa327e4.
Merge "Revert "Revert "dvm: Bring back the ANDROID_DATA override""" into jb-mr2