Merge "Full-stack integrity: check vdex contents." am: 7b5e244b99
am: e5e5501c8e

Change-Id: I47ff20ca395534a54c6b817e2e5ec981370a5de7