Merge "Handle unset ANDROID_DATA in DexLocationToOatFilename"