Merge "Make 567-checker-compare less Dex-sensitive."
am: a62747766b

Change-Id: I11f3edcc552fea2f8d74ff4c8996aa5c0b9c17b3