Merge "Make 567-checker-compare less Dex-sensitive."