Merge "Revert "Do not diff .odex files""