Merge "Fix incorrect odex path handling"