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

Change-Id: Ib632e31ecc492ef6ef4420b54231a9c75190e791