Merge "Remove unused GetDalvikCacheFilenameOrDie."
am: 95afcbcc25

Change-Id: I717d0c4d7a482c1544d934b7ed80f7c8f7493e6b