Merge "Up-to-date odex files should take precedence over profile checks"