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

Change-Id: I31aaa515d41513c52f28f5aac47f066ff1b82c4c