Merge "Fix for "dexopt: No such file or directory" error"