Merge "Revert "Full-stack integrity: check vdex contents.""