Merge "Enable dex diff check on debug builds."