Merge "Revert "Full-stack integrity: check vdex contents."" am: cc4e7b7c7b
am: 1ccc6c6d68

Change-Id: Iff60d6dfb63c5f793790d351adff011ded8d55e4