Merge "Changed dvmDexCacheStatus to check for odex file first."