Merge "Handle unset ANDROID_DATA in DexLocationToOatFilename" am: 04d81ff75a
am: a4f5a9cf2b

Change-Id: If830ad8e1f3d6495311a6b35a1d1e43a36097b46