dvm: Bring back the ANDROID_DATA override

This got broken by the split-cache patch, and it's impacting the
CTS vm unit. Fixit.

Change-Id: I602824afef19c92a4d2c1702d10c8f0315277227
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1-linaro