Merge "Enable dex diff check on debug builds."
am: 76e9b6152f

Change-Id: Ia080699dec408ad66335cb3e2c3f50ee6c5b1df6